Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 06:31:09 +0000 (22:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Feb 2012 06:31:09 +0000 (22:31 -0800)
commit22dbc826f9d5257dee94506e89d6ff995ad313ab
treed40cbf29d645d219c8e1cc974d4d5dcbc195cb74
parent3828cb72247c19a5f58fc87c7621e26f47b4084d
parent69df45ea4824cf1d35e49cf6d2298a4a1d6ef74e
Merge from trunk.